Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CNF-14285: ztp: reference: Change "pod-security.kubernetes.io/" label to be prefix based #2051

Merged
merged 2 commits into from
Sep 30, 2024

Conversation

natifridman
Copy link
Contributor

No description provided.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 25, 2024
@openshift-ci-robot
Copy link
Collaborator

@natifridman: This pull request references CNF-14285 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@natifridman
Copy link
Contributor Author

/cc @lack

@openshift-ci openshift-ci bot requested a review from lack September 25, 2024 12:39
@lack
Copy link
Member

lack commented Sep 25, 2024

Given that this is a better way, perhaps we should also remove my allowLabels and requiredLabels hacks too?

@lack
Copy link
Member

lack commented Sep 25, 2024

FYI: The commit log message must begin with ztp: and not CNF-14285: ztp: - It's fine for the PR to have the CNF-XXXX prefix, but not the git commit.

@natifridman
Copy link
Contributor Author

Given that this is a better way, perhaps we should also remove my allowLabels and requiredLabels hacks too?

Removed allowLabels

@@ -9,7 +9,4 @@ metadata:
"workload.openshift.io/allowed: \"management\""
"openshift.io/cluster-monitoring: \"true\""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can also get rid of this requiredLabels template helper... In fact, it may be easier to just revert 8ec2e88 entirely.

- pathToKey: metadata.labels."pod-security.kubernetes.io/warn"
- pathToKey: metadata.labels."pod-security.kubernetes.io/warn-version"
- pathToKey: metadata.labels."pod-security.kubernetes.io/"
isPrefix: true
Copy link
Member

@lack lack Sep 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a little more we can remove: Look for every other pod-security.kubernetes.io in this section:
(line 187 and line 193 can be deleted too)

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 29, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 29, 2024
@natifridman natifridman force-pushed the label-prefix branch 2 times, most recently from 22f737a to efa83d0 Compare September 29, 2024 07:52
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 30, 2024
@lack
Copy link
Member

lack commented Sep 30, 2024

/approve

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 30, 2024
Copy link
Contributor

openshift-ci bot commented Sep 30, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lack, natifridman

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit abfab3d into openshift-kni:master Sep 30, 2024
6 checks passed
@natifridman natifridman deleted the label-prefix branch October 14, 2024 10:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants